From 65daf3ef4e5ee312ec817ba271edfaccf1aed74b Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Fri, 27 Jun 2008 14:11:41 +0100 Subject: [PATCH] vt-d: Minor fixing of interrupt remapping When ir_ctrl->iremap_index == -1, it means there is no remap entry. So it needn't to convert from remap format to normal ioapic format. Signed-off-by: Weidong Han --- xen/drivers/passthrough/vtd/intremap.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/drivers/passthrough/vtd/intremap.c b/xen/drivers/passthrough/vtd/intremap.c index 3b6a2795c4..5654813b13 100644 --- a/xen/drivers/passthrough/vtd/intremap.c +++ b/xen/drivers/passthrough/vtd/intremap.c @@ -52,7 +52,7 @@ static void remap_entry_to_ioapic_rte( unsigned long flags; struct ir_ctrl *ir_ctrl = iommu_ir_ctrl(iommu); - if ( ir_ctrl == NULL || ir_ctrl->iremap_index < 0 ) + if ( ir_ctrl == NULL ) { dprintk(XENLOG_ERR VTDPREFIX, "remap_entry_to_ioapic_rte: ir_ctl is not ready\n"); @@ -170,7 +170,8 @@ unsigned int io_apic_read_remap_rte( struct iommu *iommu = ioapic_to_iommu(mp_ioapics[apic].mpc_apicid); struct ir_ctrl *ir_ctrl = iommu_ir_ctrl(iommu); - if ( !iommu || !ir_ctrl || ir_ctrl->iremap_maddr == 0 ) + if ( !iommu || !ir_ctrl || ir_ctrl->iremap_maddr == 0 || + ir_ctrl->iremap_index == -1 ) { *IO_APIC_BASE(apic) = reg; return *(IO_APIC_BASE(apic)+4); -- 2.30.2